From 593bc65f540be46fda522fa680a95bfc17fb16b0 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 1 Feb 2002 19:49:49 +0000 Subject: [PATCH] set tree to NULL if tree_view->priv->tree is NULL (#70152, patch by John Fri Feb 1 20:50:29 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 9 ++++++--- 8 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf296ddbe5..8440e12374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf296ddbe5..8440e12374 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Feb 1 20:50:29 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to + NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper). + Fri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b7b60cc508..5854332b20 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3475,9 +3475,12 @@ gtk_tree_view_dy_to_top_row (GtkTreeView *tree_view) GtkRBNode *node; gtk_tree_row_reference_free (tree_view->priv->top_row); - tree_view->priv->top_row_dy = _gtk_rbtree_find_offset (tree_view->priv->tree, - tree_view->priv->dy, - &tree, &node); + if (tree_view->priv->tree == NULL) + tree = NULL; + else + tree_view->priv->top_row_dy = _gtk_rbtree_find_offset (tree_view->priv->tree, + tree_view->priv->dy, + &tree, &node); if (tree == NULL) { tree_view->priv->top_row = NULL; -- 2.30.2